Merge branch 'main' of https://github.com/codethink-cn/Inkar-Suki

HornCopper · Sep 5, 2024 · b36fa3e · b36fa3e
2 parents 4f4b70c + 24eadb2
commit b36fa3e
Showing 1 changed file with 30 additions and 28 deletions.
diff --git a/src/views/jx3/calculator/calculator.html b/src/views/jx3/calculator/calculator.html
@@ -128,36 +128,38 @@
 </head>
 
 <body>
-    <div class="message-box">
-        <div class="element">
-            <div class="cell-title"><span>手打</span></div>
-            <div class="cell">{{ max }}</div>
+    <div class="total" style="display: inline-block;">
+        <div class="message-box">
+            <div class="element">
+                <div class="cell-title"><span>手打</span></div>
+                <div class="cell">{{ max }}</div>
+            </div>
+            <div class="element">
+                <div class="cell-title"><span>一键宏</span></div>
+                <div class="cell">{{ min }}</div>
+            </div>
         </div>
-        <div class="element">
-            <div class="cell-title"><span>一键宏</span></div>
-            <div class="cell">{{ min }}</div>
+            <table style="background-color: #FFFFFF">
+                <thead>
+                    <tr>
+                        <th class="short-column" style="height:20px">技能</th>
+                        <th class="short-column" style="height:20px">占比</th>
+                        <th class="short-column" style="height:20px">次数</th>
+                        <th class="short-column" style="height:20px">伤害</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {{ tables }}
+                </tbody>
+                <tfoot>
+                    <tr>
+                        <td colspan="7">&copy; Inkar Suki · {{ school }}DPS计算器 · {{ server }} · {{ name }} ·
+                            06:41<br>计算器数据来源：{{ calculator }}
+                        </td>
+                    </tr>
+                </tfoot>
+            </table>
         </div>
-        <table style="background-color: #FFFFFF">
-            <thead>
-                <tr>
-                    <th class="short-column" style="height:20px">技能</th>
-                    <th class="short-column" style="height:20px">占比</th>
-                    <th class="short-column" style="height:20px">次数</th>
-                    <th class="short-column" style="height:20px">伤害</th>
-                </tr>
-            </thead>
-            <tbody>
-                {{ tables }}
-            </tbody>
-            <tfoot>
-                <tr>
-                    <td colspan="7">&copy; Inkar Suki · {{ school }}DPS计算器 · {{ server }} · {{ name }} ·
-                        06:41<br>计算器数据来源：{{ calculator }}
-                    </td>
-                </tr>
-            </tfoot>
-        </table>
-    </div>
 </body>
 
 </html>