Skip to content

Commit 2fcf962

Browse files
authored
UI: Fix duplicate memory values on InfoCard view conditions (#11896)
1 parent 8bbe253 commit 2fcf962

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

ui/src/components/view/InfoCard.vue

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -259,26 +259,6 @@
259259
</span>
260260
</div>
261261
</div>
262-
<div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
263-
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
264-
<div class="resource-detail-item__details">
265-
<font-awesome-icon
266-
:icon="['fa-solid', 'fa-microchip']"
267-
class="anticon"
268-
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
269-
<span>
270-
{{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
271-
<router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
272-
<span v-else>{{ resource.gpucardname }}</span>
273-
<router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
274-
<span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
275-
<span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
276-
<br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') + ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
277-
(resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
278-
</span>
279-
</span>
280-
</div>
281-
</div>
282262
<div class="resource-detail-item" v-else-if="resource.memorytotalgb">
283263
<div class="resource-detail-item__label">{{ $t('label.memory') }}</div>
284264
<div class="resource-detail-item__details">
@@ -344,6 +324,26 @@
344324

345325
</div>
346326
</div>
327+
<div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
328+
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
329+
<div class="resource-detail-item__details">
330+
<font-awesome-icon
331+
:icon="['fa-solid', 'fa-microchip']"
332+
class="anticon"
333+
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
334+
<span>
335+
{{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
336+
<router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
337+
<span v-else>{{ resource.gpucardname }}</span>
338+
<router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
339+
<span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
340+
<span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
341+
<br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') + ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
342+
(resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
343+
</span>
344+
</span>
345+
</div>
346+
</div>
347347
<div class="resource-detail-item" v-if="resource.gputotal">
348348
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
349349
<div class="resource-detail-item__details">

0 commit comments

Comments
 (0)