From 6a214b37967f95254eabffba95c57e43445bad07 Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Mon, 1 Dec 2025 15:30:40 +0800
Subject: [PATCH 1/6] =?UTF-8?q?style:=20=E7=BA=B8=E7=AE=A1=E9=87=8D?=
 =?UTF-8?q?=E9=87=8F=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将结果由卡片式调整为列表式
---
 src/components.d.ts                           |  4 +-
 src/components/InputParamSection.vue          | 20 ++++++
 .../Modules/PaperTubeWeightCalculate.vue      | 64 ++++++++++++++-----
 src/components/ResultSection.vue              | 21 ++++++
 src/plugins/vuetify.ts                        |  5 ++
 5 files changed, 98 insertions(+), 16 deletions(-)
 create mode 100644 src/components/InputParamSection.vue
 create mode 100644 src/components/ResultSection.vue

diff --git a/src/components.d.ts b/src/components.d.ts
index e55f69c..133d2d1 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -9,7 +9,9 @@ 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']
     PaperRollWeightLengthCalculate: typeof import('./components/Modules/PaperRollWeightLengthCalculate.vue')['default']
     PaperTapeWidthAngleCalculate: typeof import('./components/Modules/PaperTapeWidthAngleCalculate.vue')['default']
@@ -17,9 +19,9 @@ declare module 'vue' {
     PaperTubeWeightCalculate: typeof import('./components/Modules/PaperTubeWeightCalculate.vue')['default']
     ParamInputField: typeof import('./components/ParamInputField.vue')['default']
     ResultCard: typeof import('./components/ResultCard.vue')['default']
+    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 @@
+<template>
+  <v-list-item>
+    <v-list-item-title class="text-h6 text-primary">
+      {{ value.value.toFixed(fixed ?? 2) }} {{ $t(`units.${value.unit}`) }}
+    </v-list-item-title>
+    <v-list-item-subtitle>
+      {{ label }}
+    </v-list-item-subtitle>
+  </v-list-item>
+</template>
+
+<script setup lang="ts">
+  import type { Param } from '@/types/param'
+
+  defineProps<{
+    label: string
+    value: Param
+    fixed?: number
+  }>()
+</script>
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') }}
           </v-card-title>
 
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('singlePaperTubeWeight')}`"
-                :value="result.singlePaperTubeWeight"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('totalPaperTubeWeight')}`"
-                :value="result.totalPaperTubeWeight"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section :label="$t('singlePaperTubeWeight')" :value="result.singlePaperTubeWeight" />
+            <result-section :label="$t('totalPaperTubeWeight')" :value="result.totalPaperTubeWeight" />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollLength')" :value="paperRollLength" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section
+                      :label="$t('paperDensity')"
+                      :value="paperDensity"
+                    />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section
+                      :fixed="0"
+                      :label="$t('productionAmount')"
+                      :value="productionAmount"
+                    />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollWallThickness')" :value="paperRollWallThickness" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
         </v-card>
+
       </v-col>
     </v-row>
   </div>
@@ -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/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 @@
+<template>
+  <div>
+    <v-list-item>
+      <v-list-item-title class="text-h4 text-primary font-weight-bold">
+        {{ value.value.toFixed(2) }} {{ $t(`units.${value.unit}`) }}
+      </v-list-item-title>
+      <v-list-item-subtitle>
+        {{ label }}
+      </v-list-item-subtitle>
+    </v-list-item>
+  </div>
+</template>
+
+<script setup lang="ts">
+  import type { Param } from '@/types/param'
+
+  defineProps<{
+    label: string
+    value: Param
+  }>()
+</script>
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,
     },

From ca5d33cf0949b86699c0dd363b1cc2f7c6a25da4 Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Mon, 1 Dec 2025 15:44:30 +0800
Subject: [PATCH 2/6] =?UTF-8?q?style:=20=E7=9A=AE=E5=B8=A6=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将计算结果由卡片式转为列表式
---
 .../Modules/BeltSpecificationCalculate.vue    | 66 +++++++++++++------
 1 file changed, 46 insertions(+), 20 deletions(-)

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') }}
           </v-card-title>
 
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('recommendBeltThickness')}`"
-                :value="result.recommendBeltThickness"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('recommendBeltWidth')}`"
-                :value="result.recommendBeltWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('recommendBeltLength')}`"
-                :value="result.recommendBeltLength"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="`${$t('recommendBeltThickness')}`"
+              :value="result.recommendBeltThickness"
+            />
+            <result-section
+              :label="`${$t('recommendBeltWidth')}`"
+              :value="result.recommendBeltWidth"
+            />
+            <result-section
+              :label="`${$t('recommendBeltLength')}`"
+              :value="result.recommendBeltLength"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('maxWheelbase')" :value="maxWheelbase" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('hubDiameter')" :value="hubDiameter" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollWallThickness')" :value="paperRollWallThickness" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
+
         </v-card>
       </v-col>
     </v-row>

From 17bda531d73a1a54beef2ca8472ef25f69eefc5a Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Mon, 1 Dec 2025 15:55:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?style:=20=E7=BA=B8=E5=8D=B7=E9=87=8D?=
 =?UTF-8?q?=E9=87=8F=E9=95=BF=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 结果显示由卡片式变为列表式
---
 .../PaperRollWeightLengthCalculate.vue        | 71 +++++++++++++------
 1 file changed, 51 insertions(+), 20 deletions(-)

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') }}
           </v-card-title>
 
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="$t('paperRollWeight')"
-                :value="result.paperRollWeight"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('paperRollLength')"
-                :value="result.paperRollLength"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('paperThickness')"
-                :value="result.paperThickness"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="$t('paperRollWeight')"
+              :value="result.paperRollWeight"
+            />
+            <result-section
+              :label="$t('paperRollLength')"
+              :value="result.paperRollLength"
+            />
+            <result-section
+              :label="$t('paperThickness')"
+              :value="result.paperThickness"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperCoreDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollExternalDiameter')" :value="paperRollExternalDiameter" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollWidth')" :value="paperRollWidth" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperDensity')" :value="paperDensity" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperGrammage')" :value="paperGrammage" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
+
         </v-card>
       </v-col>
     </v-row>

From c6190a0788033501756099ea44edbe113af2c3c4 Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Mon, 1 Dec 2025 16:05:59 +0800
Subject: [PATCH 4/6] =?UTF-8?q?style:=20=E7=BA=B8=E5=8D=B7=E4=BA=A7?=
 =?UTF-8?q?=E8=83=BD=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 结果展示由卡片式转为列表式
---
 .../Modules/PaperTubeProductionCalculate.vue  | 112 ++++++++++++------
 1 file changed, 74 insertions(+), 38 deletions(-)

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') }}
           </v-card-title>
 
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="$t('feedPaperSpeed')"
-                :value="result.feedPaperSpeed"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('outputSpeed')"
-                :value="result.outputSpeed"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('productionAmountPerHour')"
-                :value="result.productionAmountPerHour"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('productionWeightPerHour')"
-                :value="result.productionWeightPerHour"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('productionAmountPerDay')"
-                :value="result.productionAmountPerDay"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="$t('productionWeightPerDay')"
-                :value="result.productionWeightPerDay"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="$t('feedPaperSpeed')"
+              :value="result.feedPaperSpeed"
+            />
+            <result-section
+              :label="$t('outputSpeed')"
+              :value="result.outputSpeed"
+            />
+            <result-section
+              :label="$t('productionAmountPerHour')"
+              :value="result.productionAmountPerHour"
+            />
+            <result-section
+              :label="$t('productionWeightPerHour')"
+              :value="result.productionWeightPerHour"
+            />
+            <result-section
+              :label="$t('productionAmountPerDay')"
+              :value="result.productionAmountPerDay"
+            />
+            <result-section
+              :label="$t('productionWeightPerDay')"
+              :value="result.productionWeightPerDay"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollWallThickness')" :value="paperRollWallThickness" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollLength')" :value="paperRollLength" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperDensity')" :value="paperDensity" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('innerPaperWidth')" :value="innerPaperWidth" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('workFrequency')" :value="workFrequency" />
+                  </v-col>
+                </v-row>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('workTime')" :value="workTime" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('workEfficiency')" :value="workEfficiency" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
+
         </v-card>
       </v-col>
     </v-row>

From 5651405605286ec67540b75201304fc86976418a Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Mon, 1 Dec 2025 16:18:33 +0800
Subject: [PATCH 5/6] =?UTF-8?q?style:=20=E7=BA=B8=E5=B8=A6=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E9=95=BF=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将结果展示由卡片式变为列表式
---
 .../Modules/PaperTapeWidthAngleCalculate.vue  | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

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') }}
           </v-card-title>
 
-          <v-row>
-            <v-col cols="12">
-              <result-card :label="$t('beltAngle')" :value="result.beltAngle" />
-            </v-col>
-            <v-col cols="12">
-              <result-card :label="$t('paperHolderAngle')" :value="result.paperHolderAngle" />
-            </v-col>
-            <v-col cols="12">
-              <result-card :label="$t('leadingLength')" :value="result.leadingLength" />
-            </v-col>
-            <v-col cols="12">
-              <result-card :label="$t('paperWidth')" :value="result.paperWidth" />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section :label="$t('beltAngle')" :value="result.beltAngle" />
+            <result-section :label="$t('paperHolderAngle')" :value="result.paperHolderAngle" />
+            <result-section :label="$t('leadingLength')" :value="result.leadingLength" />
+            <result-section :label="$t('paperWidth')" :value="result.paperWidth" />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperRollWallThickness')" :value="paperRollWallThickness" />
+                  </v-col>
+                  <v-col cols="12">
+                    <input-param-section :label="$t('innerPaperWidth')" :value="innerPaperWidth" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
         </v-card>
       </v-col>
     </v-row>

From b894d2a4ae7b33ed79c588519d2b16454d68293a Mon Sep 17 00:00:00 2001
From: R2m1liA <15258427350@163.com>
Date: Mon, 1 Dec 2025 16:44:40 +0800
Subject: [PATCH 6/6] =?UTF-8?q?style:=20=E7=BA=B8=E5=90=B8=E7=AE=A1?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将卡片式布局调整为列表式布局
---
 .../Modules/FourLayerPaperStrawCalculate.vue  | 140 ++++++++++--------
 .../Modules/ThreeLayerPaperStrawCalculate.vue | 126 +++++++++-------
 2 files changed, 148 insertions(+), 118 deletions(-)

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') }}
           </v-card-title>
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
-                :value="result.paperCoreDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
-                :value="result.paperTubeExternalDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeThickness')}`"
-                :value="result.paperTubeWallThickness"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
-                :value="result.bottomPaperAngle"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.leadingLength')}`"
-                :value="result.leadingLength"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
-                :value="result.bottomPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.secondLayerPaperWidth')}`"
-                :value="result.secondLayerPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.thirdLayerPaperWidth')}`"
-                :value="result.thirdLayerPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.topPaperWidth')}`"
-                :value="result.topPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.beltWidth')}`"
-                :value="result.beltWidth"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
+              :value="result.paperCoreDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
+              :value="result.paperTubeExternalDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeThickness')}`"
+              :value="result.paperTubeWallThickness"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
+              :value="result.bottomPaperAngle"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.leadingLength')}`"
+              :value="result.leadingLength"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
+              :value="result.bottomPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.secondLayerPaperWidth')}`"
+              :value="result.secondLayerPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.thirdLayerPaperWidth')}`"
+              :value="result.thirdLayerPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.topPaperWidth')}`"
+              :value="result.topPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.beltWidth')}`"
+              :value="result.beltWidth"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperWidth')" :value="bottomPaperWidth" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperThickness')" :value="bottomPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('secondLayerPaperThickness')" :value="secondLayerPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('thirdLayerPaperThickness')" :value="thirdLayerPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('topPaperThickness')" :value="topPaperThickness" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
+
         </v-card>
       </v-col>
     </v-row>
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') }}
           </v-card-title>
-          <v-row>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
-                :value="result.paperCoreDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
-                :value="result.paperTubeExternalDiameter"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.paperTubeThickness')}`"
-                :value="result.paperTubeWallThickness"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
-                :value="result.bottomPaperAngle"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.leadingLength')}`"
-                :value="result.leadingLength"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
-                :value="result.bottomPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.middlePaperWidth')}`"
-                :value="result.middlePaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.topPaperWidth')}`"
-                :value="result.topPaperWidth"
-              />
-            </v-col>
-            <v-col cols="12">
-              <result-card
-                :label="`${$t('paperStrawResult.beltWidth')}`"
-                :value="result.beltWidth"
-              />
-            </v-col>
-          </v-row>
+          <v-list lines="two">
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeInnerDiameter')}`"
+              :value="result.paperCoreDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeExternalDiameter')}`"
+              :value="result.paperTubeExternalDiameter"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.paperTubeThickness')}`"
+              :value="result.paperTubeWallThickness"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperAngle')}`"
+              :value="result.bottomPaperAngle"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.leadingLength')}`"
+              :value="result.leadingLength"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.bottomPaperWidth')}`"
+              :value="result.bottomPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.middlePaperWidth')}`"
+              :value="result.middlePaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.topPaperWidth')}`"
+              :value="result.topPaperWidth"
+            />
+            <result-section
+              :label="`${$t('paperStrawResult.beltWidth')}`"
+              :value="result.beltWidth"
+            />
+          </v-list>
+
+          <v-expansion-panels flat multiple>
+            <v-expansion-panel hide-actions>
+              <v-expansion-panel-title class="text-warning font-weight-bold">
+                <template #default="{ expanded }">
+                  <span>
+                    <v-icon icon="mdi-information-outline" />
+                    {{ expanded ? $t('calculationParameters') : $t('expandToShowCalculationParameters') }}
+                  </span>
+                </template>
+              </v-expansion-panel-title>
+              <v-expansion-panel-text>
+                <v-row>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('paperTubeInnerDiameter')" :value="paperCoreDiameter" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperWidth')" :value="bottomPaperWidth" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('bottomPaperThickness')" :value="bottomPaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('middlePaperThickness')" :value="middlePaperThickness" />
+                  </v-col>
+                  <v-col cols="6">
+                    <input-param-section :label="$t('topPaperThickness')" :value="topPaperThickness" />
+                  </v-col>
+                </v-row>
+              </v-expansion-panel-text>
+            </v-expansion-panel>
+          </v-expansion-panels>
         </v-card>
       </v-col>
     </v-row>