From 5dcd40b2afb66e82b5e9f0b94fb0816d1d468fc4 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 06 九月 2023 10:26:39 +0800 Subject: [PATCH] # --- src/main/webapp/views/console.html | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index d2102cf..3c5f1f0 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -22,12 +22,12 @@ <div v-for="(col,idx) in row" :key="idx"> <div v-if="col.value == 0"> <!-- 瀛愯建閬� 璺緞涓虹┛姊溅棰勮璺緞鍒欐樉绀虹┛姊溅棰滆壊鍜岀┛姊溅鍙� --> - <div :style="{background: checkAdvancePath(index,idx) == null ? '':shuttleColorList[checkAdvancePath(index,idx)]}" class="item" v-if="col.data.length > 0">{{col.data}}</div> - <div :style="{background: checkAdvancePath(index,idx) == null ? '':shuttleColorList[checkAdvancePath(index,idx)]}" class="item" v-else>{{checkAdvancePath(index,idx) == null ? idx:checkAdvancePath(index,idx)}}</div> + <div :style="{background: checkAdvancePath(index,idx).length == 0 ? '':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item" v-if="col.data.length > 0">{{col.data}}</div> + <div :style="{background: checkAdvancePath(index,idx).length == 0 ? '':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item" v-else>{{checkAdvancePath(index,idx).length == 0 ? idx:checkAdvancePath(index,idx)}}</div> </div> <div v-else-if="col.value == 3"> <!-- 姣嶈建閬� 璺緞涓虹┛姊溅棰勮璺緞鍒欐樉绀虹┛姊溅棰滆壊鍜岀┛姊溅鍙� --> - <div :style="{background: checkAdvancePath(index,idx) == null ? '#5af':shuttleColorList[checkAdvancePath(index,idx)]}" class="item">{{checkAdvancePath(index,idx) == null ? '⇅⇄':checkAdvancePath(index,idx)}}</div> + <div :style="{background: checkAdvancePath(index,idx).length == 0 ? '#5af':shuttleColorList[checkAdvancePath(index,idx)[0]]}" class="item">{{checkAdvancePath(index,idx).length == 0 ? '⇅⇄':checkAdvancePath(index,idx)}}</div> </div> <div v-else-if="col.value == 4"> <!-- 绔欑偣 --> @@ -593,6 +593,7 @@ }) } }) + let data = [] let shuttleList = this.currentLevShuttleList; for (var i = 0; i < shuttleList.length; i++) { let shuttle = shuttleList[i] @@ -601,12 +602,13 @@ for (var j = 0; j < moveAdvancePath.length; j++) { let path = moveAdvancePath[j] if (path.x-1 === x && path.y === y) {//璺緞绗﹀悎 - return shuttle.shuttleNo;//杩斿洖灏忚溅鍙� + data.push(shuttle.shuttleNo) + continue; } } } } - return null; + return data;//杩斿洖灏忚溅鍙烽泦鍚� } } }) -- Gitblit v1.9.1