diff --git a/src/components.d.ts b/src/components.d.ts index 3bfcae7..133d2d1 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -9,6 +9,7 @@ export {} declare module 'vue' { export interface GlobalComponents { BeltSpecificationCalculate: typeof import('./components/Modules/BeltSpecificationCalculate.vue')['default'] + CalculateResult: typeof import('./components/CalculateResult.vue')['default'] FourLayerPaperStrawCalculate: typeof import('./components/Modules/FourLayerPaperStrawCalculate.vue')['default'] InputParamSection: typeof import('./components/InputParamSection.vue')['default'] MultiLayerPaperTapeWidthAngleCalculate: typeof import('./components/Modules/MultiLayerPaperTapeWidthAngleCalculate.vue')['default'] @@ -21,7 +22,6 @@ declare module 'vue' { ResultSection: typeof import('./components/ResultSection.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] - ThreeeLayerPaperStrawCalculate: typeof import('./components/Modules/threeeLayerPaperStrawCalculate.vue')['default'] ThreeLayerPaperStrawCalculate: typeof import('./components/Modules/ThreeLayerPaperStrawCalculate.vue')['default'] } } diff --git a/src/components/InputParamSection.vue b/src/components/InputParamSection.vue new file mode 100644 index 0000000..13c5205 --- /dev/null +++ b/src/components/InputParamSection.vue @@ -0,0 +1,20 @@ + + + diff --git a/src/components/Modules/BeltSpecificationCalculate.vue b/src/components/Modules/BeltSpecificationCalculate.vue index 4caf2ff..93c44eb 100644 --- a/src/components/Modules/BeltSpecificationCalculate.vue +++ b/src/components/Modules/BeltSpecificationCalculate.vue @@ -83,26 +83,52 @@ {{ $t('results') }} - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Modules/FourLayerPaperStrawCalculate.vue b/src/components/Modules/FourLayerPaperStrawCalculate.vue index a5648af..3f847c5 100644 --- a/src/components/Modules/FourLayerPaperStrawCalculate.vue +++ b/src/components/Modules/FourLayerPaperStrawCalculate.vue @@ -66,68 +66,84 @@ /> {{ $t('results') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Modules/PaperRollWeightLengthCalculate.vue b/src/components/Modules/PaperRollWeightLengthCalculate.vue index 047c1f9..cd6e623 100644 --- a/src/components/Modules/PaperRollWeightLengthCalculate.vue +++ b/src/components/Modules/PaperRollWeightLengthCalculate.vue @@ -93,26 +93,57 @@ {{ $t('results') }} - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Modules/PaperTapeWidthAngleCalculate.vue b/src/components/Modules/PaperTapeWidthAngleCalculate.vue index 1f63fd6..b1d97d1 100644 --- a/src/components/Modules/PaperTapeWidthAngleCalculate.vue +++ b/src/components/Modules/PaperTapeWidthAngleCalculate.vue @@ -68,20 +68,38 @@ {{ $t('results') }} - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Modules/PaperTubeProductionCalculate.vue b/src/components/Modules/PaperTubeProductionCalculate.vue index 525ef61..b4e8cc4 100644 --- a/src/components/Modules/PaperTubeProductionCalculate.vue +++ b/src/components/Modules/PaperTubeProductionCalculate.vue @@ -111,44 +111,80 @@ {{ $t('results') }} - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/Modules/PaperTubeWeightCalculate.vue b/src/components/Modules/PaperTubeWeightCalculate.vue index 833fa2f..9c4e484 100644 --- a/src/components/Modules/PaperTubeWeightCalculate.vue +++ b/src/components/Modules/PaperTubeWeightCalculate.vue @@ -93,21 +93,55 @@ {{ $t('results') }} - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,7 +172,7 @@ const resetParameters = () => { paperRollLength.value = createParam(1000, 'mm') - paperDensity.value = createParam(0.76, 'gpcm3') + paperDensity.value = createParam(0.76, 'g_per_cm3') productionAmount.value = createParam(1000, 'pcs') paperCoreDiameter.value = createParam(76.2, 'mm') paperRollWallThickness.value = createParam(10, 'mm') diff --git a/src/components/Modules/ThreeLayerPaperStrawCalculate.vue b/src/components/Modules/ThreeLayerPaperStrawCalculate.vue index 7a6cf96..cf8f6ac 100644 --- a/src/components/Modules/ThreeLayerPaperStrawCalculate.vue +++ b/src/components/Modules/ThreeLayerPaperStrawCalculate.vue @@ -63,62 +63,76 @@ /> {{ $t('results') }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/ResultSection.vue b/src/components/ResultSection.vue new file mode 100644 index 0000000..e965a06 --- /dev/null +++ b/src/components/ResultSection.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/plugins/vuetify.ts b/src/plugins/vuetify.ts index 679f22e..9721582 100644 --- a/src/plugins/vuetify.ts +++ b/src/plugins/vuetify.ts @@ -30,6 +30,11 @@ const jinshenLightTheme: ThemeDefinition = { export default createVuetify({ theme: { defaultTheme: 'light', + variations: { + colors: ['primary', 'secondary', 'success', 'info', 'warning', 'error'], + lighten: 5, + darken: 5, + }, themes: { light: jinshenLightTheme, },