Browse code Merge branch 'dev' of http://111.198.10.15:12003/gitbucket/git/codedev/smart-metering-front into dev Conflicts: package.json pnpm-lock.yaml metering vue3-front vue3-only-sidebar
commit 091c5e255c312b3942383961508da9daa9ee65af 2 parents 3f02e31 + 35dce6a Stephanie authored on 16 Dec 2022

Showing 72 changed files

• package.json
• pnpm-lock.yaml
• src/api/measure/person.ts
• src/api/system/bench.ts
• src/api/system/price.ts
• src/api/system/tool.ts
• src/assets/images/bench/1671087276259.jpg
• src/components.d.ts
• src/components/echarts/index.vue
• src/components/echarts/pie.vue
• 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
• src/views/measure/person/components/certificateAddDialog.vue
• src/views/measure/person/components/personListDialog.vue
• 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
• src/views/measure/price/priceAdd.vue
• src/views/measure/source/approve.vue
• src/views/measure/source/components/all.vue
• src/views/measure/source/components/approvalPending.vue
• src/views/measure/source/components/canceled.vue
• src/views/measure/source/components/draftBox.vue
• src/views/measure/source/components/examineAndApprove.vue
• src/views/measure/source/components/listPage.vue
• src/views/measure/source/components/notPass.vue
• src/views/measure/source/components/passed.vue
• 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
• src/views/system/tool/signature/addDDialog.vue
• src/views/system/tool/signature/signature.vue
• src/views/system/tool/tool_interface.ts

Ignore Space Show notes View package.json

Ignore Space Show notes View pnpm-lock.yaml

Ignore Space Show notes View src/api/measure/person.ts

Ignore Space Show notes View src/api/system/bench.ts 0 → 100644

Ignore Space Show notes View src/api/system/price.ts 0 → 100644

Ignore Space Show notes View src/api/system/tool.ts

Ignore Space Show notes View src/assets/images/bench/1671087276259.jpg 0 → 100644

Ignore Space Show notes View src/components.d.ts

Ignore Space Show notes View src/components/echarts/index.vue 0 → 100644

Ignore Space Show notes View src/components/echarts/pie.vue 0 → 100644

Ignore Space Show notes View src/views/measure/bench/bench.vue

Ignore Space Show notes View src/views/measure/file/approve.vue

Ignore Space Show notes View src/views/measure/file/components/CNASfile.vue

Ignore Space Show notes View src/views/measure/file/components/addDialog.vue

Ignore Space Show notes View src/views/measure/file/components/approve/templatePage.vue

Ignore Space Show notes View src/views/measure/file/components/homeworkFile.vue

Ignore Space Show notes View src/views/measure/file/components/programFile.vue

Ignore Space Show notes View src/views/measure/file/components/qualityManual.vue

Ignore Space Show notes View src/views/measure/file/components/statute.vue

Ignore Space Show notes View src/views/measure/file/components/technicalCapability.vue

Ignore Space Show notes View src/views/measure/file/components/templatePage.vue

Ignore Space Show notes View src/views/measure/file/manageMethod.vue

Ignore Space Show notes View src/views/measure/file/measureRule.vue

Ignore Space Show notes View src/views/measure/file/quality.vue

Ignore Space Show notes View src/views/measure/file/rules.vue

Ignore Space Show notes View src/views/measure/file/testingMethod.vue

Ignore Space Show notes View src/views/measure/measureDept/bm.vue

Ignore Space Show notes View src/views/measure/measureDept/components/addDialog.vue

Ignore Space Show notes View src/views/measure/measureDept/components/templatePage.vue

Ignore Space Show notes View src/views/measure/measureDept/gcz.vue

Ignore Space Show notes View src/views/measure/measureDept/ks.vue

Ignore Space Show notes View src/views/measure/measureDept/measureDept-interface.ts

Ignore Space Show notes View src/views/measure/person/certificateLog.vue

Ignore Space Show notes View src/views/measure/person/components/addPerson.vue

Ignore Space Show notes View src/views/measure/person/components/addRecord.vue 0 → 100644

Ignore Space Show notes View src/views/measure/person/components/certificateAddDialog.vue

Ignore Space Show notes View src/views/measure/person/components/personListDialog.vue 0 → 100644

Ignore Space Show notes View src/views/measure/person/list.vue

Ignore Space Show notes View src/views/measure/person/person-interface.ts

Ignore Space Show notes View src/views/measure/person/remind.vue

Ignore Space Show notes View src/views/measure/price/list.vue

Ignore Space Show notes View src/views/measure/price/list_interface.ts 0 → 100644

Ignore Space Show notes View src/views/measure/price/priceAdd.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/approve.vue

Ignore Space Show notes View src/views/measure/source/components/all.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/approvalPending.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/canceled.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/draftBox.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/examineAndApprove.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/listPage.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/notPass.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/components/passed.vue 0 → 100644

Ignore Space Show notes View src/views/measure/source/list.vue

Ignore Space Show notes View src/views/measure/source/listAdd.vue

Ignore Space Show notes View src/views/measure/train/plan.vue

Ignore Space Show notes View src/views/measure/train/planAdd.vue

Ignore Space Show notes View src/views/measure/train/plan_interface.ts

Ignore Space Show notes View src/views/measure/train/trainLog.vue

Ignore Space Show notes View src/views/measure/train/trainLogAdd.vue

Ignore Space Show notes View src/views/system/notice/noteAdd.vue

Ignore Space Show notes View src/views/system/notice/noteList.vue

Ignore Space Show notes View src/views/system/notice/noticeDetail.vue

Ignore Space Show notes View src/views/system/tool/autograph/addDDialog.vue

Ignore Space Show notes View src/views/system/tool/autograph/autograph.vue

Ignore Space Show notes View src/views/system/tool/certificate/addDDialog.vue

Ignore Space Show notes View src/views/system/tool/certificate/certificate.vue

Ignore Space Show notes View src/views/system/tool/document/addDDialog.vue

Ignore Space Show notes View src/views/system/tool/document/document.vue

Ignore Space Show notes View src/views/system/tool/showPhoto.vue 0 → 100644

Ignore Space Show notes View src/views/system/tool/signature/addDDialog.vue

Ignore Space Show notes View src/views/system/tool/signature/signature.vue

Ignore Space Show notes View src/views/system/tool/tool_interface.ts

Show line notes below