Browse code feat<views>: 处理冲突 dev
commit 7b11f187091fd5a678ead7173bb047d9fa95bb27 2 parents a573dc3 + 6e9d7b3 Stephanie authored on 27 Dec 2022

Showing 41 changed files

• .gitignore
• public/data.json
• src/api/measure/file.ts
• src/components/drawer/copyerDrawer.vue
• src/router/modules/device.ts
• src/router/modules/measure.ts
• src/router/modules/system.ts
• src/views/device/borrow/components/applyList.vue
• src/views/device/borrow/components/handleList.vue
• src/views/device/receive/applyList.vue
• src/views/device/receive/createOrCheck.vue
• src/views/device/receive/selectDeviceDialog.vue
• src/views/device/receive/solveComponent/detail.vue
• src/views/device/receive/solveList.vue
• src/views/device/standingBook/components/fixedAssetsAdd.vue
• src/views/device/standingBook/components/templateAdd.vue
• src/views/device/standingBook/components/templatePage.vue
• src/views/device/standingBook/fixedAssets.vue
• src/views/device/stateManage/components/templateAdd.vue
• src/views/device/stateManage/components/templateList.vue
• src/views/measure/bench/bench-interface.ts
• src/views/measure/file/components/addDialog.vue
• src/views/measure/file/components/addDialogCancel.vue
• src/views/measure/file/components/approve/templatePage.vue
• src/views/measure/file/components/templatePage.vue
• src/views/measure/measureDept/components/addDialog.vue
• src/views/measure/measureDept/components/templatePage.vue
• src/views/measure/person/certificateLog.vue
• src/views/measure/person/components/addPerson.vue
• src/views/measure/person/components/addRecord.vue
• src/views/measure/person/list.vue
• src/views/measure/train/plan.vue
• src/views/setting.vue
• src/views/system/notice/noteList.vue
• src/views/system/process/detailProcess.vue
• src/views/system/process/editProcess.vue
• src/views/system/process/process.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

Ignore Space Show notes View .gitignore

Ignore Space Show notes View public/data.json

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

Ignore Space Show notes View src/components/drawer/copyerDrawer.vue

Ignore Space Show notes View src/router/modules/device.ts

Ignore Space Show notes View src/router/modules/measure.ts

Ignore Space Show notes View src/router/modules/system.ts

Ignore Space Show notes View src/views/device/borrow/components/applyList.vue

Ignore Space Show notes View src/views/device/borrow/components/handleList.vue

Ignore Space Show notes View src/views/device/receive/applyList.vue

Ignore Space Show notes View src/views/device/receive/createOrCheck.vue

Ignore Space Show notes View src/views/device/receive/selectDeviceDialog.vue

Ignore Space Show notes View src/views/device/receive/solveComponent/detail.vue

Ignore Space Show notes View src/views/device/receive/solveList.vue

Ignore Space Show notes View src/views/device/standingBook/components/fixedAssetsAdd.vue

Ignore Space Show notes View src/views/device/standingBook/components/templateAdd.vue

Ignore Space Show notes View src/views/device/standingBook/components/templatePage.vue

Ignore Space Show notes View src/views/device/standingBook/fixedAssets.vue

Ignore Space Show notes View src/views/device/stateManage/components/templateAdd.vue

Ignore Space Show notes View src/views/device/stateManage/components/templateList.vue

Ignore Space Show notes View src/views/measure/bench/bench-interface.ts 0 → 100644

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

Ignore Space Show notes View src/views/measure/file/components/addDialogCancel.vue 0 → 100644

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

Ignore Space Show notes View src/views/measure/file/components/templatePage.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/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

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

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

Ignore Space Show notes View src/views/setting.vue

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

Ignore Space Show notes View src/views/system/process/detailProcess.vue

Ignore Space Show notes View src/views/system/process/editProcess.vue

Ignore Space Show notes View src/views/system/process/process.vue

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

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

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

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

Show line notes below