From 0dc1f47658657e2c0895af13246413af35be3271 Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期四, 31 七月 2025 15:00:19 +0800 Subject: [PATCH] # --- src/main/webapp/views/shuttleNew.html | 68 +++++++++++++++++----------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/webapp/views/shuttleNew.html b/src/main/webapp/views/shuttleNew.html index 422bbf5..7bbb014 100644 --- a/src/main/webapp/views/shuttleNew.html +++ b/src/main/webapp/views/shuttleNew.html @@ -106,10 +106,10 @@ </select> </div> </div> - <div class="overflow-x-auto" style="height: 500px;"> + <div class="overflow-auto" style="height: 500px;"> <table class="w-full table-striped"> <thead> - <tr class="text-left text-slate-300 border-b border-slate-600"> + <tr class="text-left text-slate-300 border-b border-slate-600 bg-slate-800 sticky top-0 z-10"> <th class="py-3 px-4">缂栧彿</th> <th class="py-3 px-4">宸ヤ綔鍙�</th> <th class="py-3 px-4">浠诲姟鐘舵��</th> @@ -131,39 +131,39 @@ </tr> </thead> <tbody> - <tr v-for="(item,idx) in shuttleList" :key="idx" class="hover:bg-slate-700"> - <td class="py-3 px-4">{{ item.shuttleNo }}</td> - <td class="py-3 px-4">{{ item.taskNo }}</td> - <td class="py-3 px-4">{{ item.protocolStatus$ }}</td> - <td class="py-3 px-4">{{ item.deviceStatus$ }}</td> - <td class="py-3 px-4">{{ item.mode$ }}</td> - <td class="py-3 px-4">{{ item.currentLocNo }}</td> - <td class="py-3 px-4">{{ item.currentCode }}</td> - <td class="py-3 px-4"> - <div class="w-full bg-gray-200 rounded-full h-2.5"> - <div v-if="item.batteryPower>=70&&item.batteryPower<=100"> - <div class="bg-green-500 h-2.5 rounded-full" :style="{width: item.batteryPower + '%'}"></div> + <tr v-for="(item,idx) in shuttleList" :key="idx" class="hover:bg-slate-700"> + <td class="py-3 px-4">{{ item.shuttleNo }}</td> + <td class="py-3 px-4">{{ item.taskNo }}</td> + <td class="py-3 px-4">{{ item.protocolStatus$ }}</td> + <td class="py-3 px-4">{{ item.deviceStatus$ }}</td> + <td class="py-3 px-4">{{ item.mode$ }}</td> + <td class="py-3 px-4">{{ item.currentLocNo }}</td> + <td class="py-3 px-4">{{ item.currentCode }}</td> + <td class="py-3 px-4"> + <div class="w-full bg-gray-200 rounded-full h-2.5"> + <div v-if="item.batteryPower>=70&&item.batteryPower<=100"> + <div class="bg-green-500 h-2.5 rounded-full" :style="{width: item.batteryPower + '%'}"></div> + </div> + <div v-else-if="item.batteryPower>=40&&item.batteryPower<70"> + <div class="bg-yellow-500 h-2.5 rounded-full" :style="{width: item.batteryPower + '%'}"></div> + </div> + <div v-else> + <div class="red h-2.5 rounded-full" :style="{width: item.batteryPower + '%'}"></div> + </div> </div> - <div v-else-if="item.batteryPower>=40&&item.batteryPower<70"> - <div class="bg-yellow-500 h-2.5 rounded-full" :style="{width: item.batteryPower + '%'}"></div> - </div> - <div v-else> - <div class="red h-2.5 rounded-full" :style="{width: item.batteryPower + '%'}"></div> - </div> - </div> - <span class="text-xs text-gray-500">{{ item.batteryPower }}%</span> - </td> - <td class="py-3 px-4">{{ item.extend.voltage }}</td> - <td class="py-3 px-4">{{ item.speed }}</td> - <td class="py-3 px-4">{{ item.hasPallet$ }}</td> - <td class="py-3 px-4">{{ item.hasLift$ }}</td> - <td class="py-3 px-4">{{ item.hasCharge$ }}</td> - <td class="py-3 px-4">{{ item.statusErrorCode$ }}</td> -<!-- <td class="py-3 px-4">{{ item.suspendState }}</td>--> - <td class="py-3 px-4">{{ item.lowerPower }}</td> - <td class="py-3 px-4">{{ item.demo$ }}</td> - <td class="py-3 px-4">{{ item.pakMk$ }}</td> - </tr> + <span class="text-xs text-gray-500">{{ item.batteryPower }}%</span> + </td> + <td class="py-3 px-4">{{ item.extend.voltage }}</td> + <td class="py-3 px-4">{{ item.speed }}</td> + <td class="py-3 px-4">{{ item.hasPallet$ }}</td> + <td class="py-3 px-4">{{ item.hasLift$ }}</td> + <td class="py-3 px-4">{{ item.hasCharge$ }}</td> + <td class="py-3 px-4">{{ item.statusErrorCode$ }}</td> + <!-- <td class="py-3 px-4">{{ item.suspendState }}</td>--> + <td class="py-3 px-4">{{ item.lowerPower }}</td> + <td class="py-3 px-4">{{ item.demo$ }}</td> + <td class="py-3 px-4">{{ item.pakMk$ }}</td> + </tr> </tbody> </table> </div> -- Gitblit v1.9.1