The hover mini-map said "This asset has a position (2835, 1410) but no level" for every asset in the product. When 0.11.0 gave LocationMapTooltip a levelid prop, NONE of its seven call sites were taught to pass one - printer, machine and PC detail pages, the toner report, enforcement reports, the warranty chip and the dashboard cards - so the component correctly reported a missing level and the preview never drew. Two payloads behind those views also emitted mapx/mapy with no level: the toner report and the enforcement report. The map PDF export had the ORIGINAL bug still in it: it plotted every filtered asset onto the sheet, so exporting the ground floor printed second-floor markers on it. Worse than on screen, because nobody can correct a sheet once it has been printed and carried onto the floor. It now exports only the level being viewed. The legacy import loader sent mapleft/maptop with no level at three call sites. That loader is the one still to run against production, and every marker it created would have been undrawable. It now resolves the site's default level - the legacy schema predates levels and has one floor plan, so that is what its coordinates mean. THE GATE MISSED ALL OF THIS because it asked whether a FILE mentions 'levelid', not whether each position does: one module emitted 'mapx' six times and 'levelid' once and passed. It now checks per occurrence, covers scripts/ as well as shopdb/ and plugins/, and fails any Vue file that binds tooltip coordinates without :levelid. Both new rules were confirmed to fail the build against planted violations before being relied on. Printer QR labels: the asset number is no longer printed. A label now reads name (8201-HPLaserJetPro), QR, FQDN, then IP. The name falls back to the assetnumber because that is where sites actually keep it - every printer here has an empty name field, so preferring the Windows queue name alone would have printed a blank line on every label.
213 lines
6.8 KiB
Vue
213 lines
6.8 KiB
Vue
<template>
|
|
<div>
|
|
<div class="no-print">
|
|
<button class="print-btn" :disabled="!printer" @click="print">Print QR Code</button>
|
|
<label>Position:
|
|
<select class="position-select" v-model="position">
|
|
<option value="1">1 - Top Left</option>
|
|
<option value="2">2 - Top Right</option>
|
|
<option value="3">3 - Middle Left</option>
|
|
<option value="4">4 - Middle Right</option>
|
|
<option value="5">5 - Bottom Left</option>
|
|
<option value="6">6 - Bottom Right</option>
|
|
</select>
|
|
</label>
|
|
</div>
|
|
|
|
<div v-if="loading" class="loading-msg">Loading...</div>
|
|
|
|
<div v-else-if="printer" class="print-sheet">
|
|
<div
|
|
v-for="pos in 6"
|
|
:key="pos"
|
|
class="label"
|
|
:class="[`pos-${pos}`, pos === parseInt(position) ? 'active' : 'inactive']"
|
|
>
|
|
<template v-if="pos === parseInt(position)">
|
|
<div class="csf-name">{{ labelName }}</div>
|
|
<div class="qr-container">
|
|
<img v-if="qrImage" :src="qrImage" class="qr-img" alt="QR" />
|
|
</div>
|
|
<div class="info-section">
|
|
<div class="info-inner">
|
|
<div v-if="fqdn" class="info-row">{{ fqdn }}</div>
|
|
<div v-if="ipAddress" class="info-row">{{ ipAddress }}</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</div>
|
|
</div>
|
|
|
|
<div v-else class="error-msg">Printer not found</div>
|
|
</div>
|
|
</template>
|
|
|
|
<script setup>
|
|
import { ref, computed, onMounted, watch, nextTick } from 'vue'
|
|
import { useRoute } from 'vue-router'
|
|
import { printersApi } from '@/api'
|
|
import { renderQrDataUrl } from '@/utils/codes'
|
|
import { buildQrUrl } from '@/utils/qrTarget'
|
|
import { getPrinterHostnameTemplate } from '@/utils/siteSettings'
|
|
|
|
const route = useRoute()
|
|
const loading = ref(true)
|
|
const printer = ref(null)
|
|
const position = ref('1')
|
|
// Render QR to a data-URL image, not a live <canvas>: canvases are unreliable
|
|
// in print output, images print every time.
|
|
const qrImage = ref('')
|
|
|
|
// What goes on the label's prominent top line: the printer's NAME, e.g.
|
|
// 8201-HPLaserJetPro. Sites keep that name in different places - the Windows
|
|
// queue name when one is set, otherwise the asset's name, and in practice most
|
|
// printers carry it as the assetnumber and nothing else, so that is the last
|
|
// fallback rather than a blank label. This is a name, not an identifier line:
|
|
// the label deliberately carries no separate "Asset #".
|
|
const labelName = computed(() =>
|
|
printer.value?.printer?.windowsname
|
|
|| printer.value?.name
|
|
|| printer.value?.assetnumber
|
|
|| '')
|
|
|
|
const ipAddress = computed(() => {
|
|
// Check direct ipaddress field first (from list API)
|
|
if (printer.value?.ipaddress && printer.value.ipaddress !== 'USB') return printer.value.ipaddress
|
|
// Fall back to communications array (from detail API)
|
|
if (!printer.value?.communications?.length) return null
|
|
const primary = printer.value.communications.find(c => c.isprimary) || printer.value.communications[0]
|
|
return primary?.ipaddress || primary?.address || null
|
|
})
|
|
|
|
// The printer's FQDN. A stored hostname wins; otherwise the site builds one from
|
|
// the IP through the printer_hostname_template setting (ADR-015), the same way
|
|
// PrinterForm and the toner report derive it.
|
|
const hostnameTemplate = ref('')
|
|
|
|
const fqdn = computed(() => {
|
|
const stored = printer.value?.printer?.hostname
|
|
if (stored) return stored
|
|
if (!ipAddress.value || !hostnameTemplate.value) return ''
|
|
return hostnameTemplate.value.replace('{ip}', ipAddress.value.replace(/\./g, '-'))
|
|
})
|
|
|
|
onMounted(async () => {
|
|
try {
|
|
hostnameTemplate.value = await getPrinterHostnameTemplate()
|
|
const response = await printersApi.get(route.params.id)
|
|
printer.value = response.data.data
|
|
} catch (error) {
|
|
console.error('Error loading printer:', error)
|
|
} finally {
|
|
loading.value = false
|
|
await nextTick()
|
|
generateQR()
|
|
}
|
|
})
|
|
|
|
watch(position, async () => {
|
|
await nextTick()
|
|
generateQR()
|
|
})
|
|
|
|
async function generateQR() {
|
|
if (!printer.value) return
|
|
const p = printer.value
|
|
const detailId = p.printer?.printerid || p.assetid
|
|
const qrUrl = await buildQrUrl('qr_target_printer', `/printers/${detailId}`, {
|
|
printerid: p.printer?.printerid || '',
|
|
assetid: p.assetid || '',
|
|
assetnumber: p.assetnumber || '',
|
|
serialnumber: p.serialnumber || '',
|
|
ip: ipAddress.value || '',
|
|
hostname: p.printer?.windowsname || p.name || '',
|
|
})
|
|
qrImage.value = await renderQrDataUrl(qrUrl)
|
|
}
|
|
|
|
function print() {
|
|
window.print()
|
|
}
|
|
</script>
|
|
|
|
<style scoped>
|
|
@page { size: letter; margin: 0; }
|
|
|
|
.no-print { margin-bottom: 20px; text-align: center; padding: 20px; }
|
|
|
|
.print-btn {
|
|
padding: 10px 30px;
|
|
font-size: 16px;
|
|
cursor: pointer;
|
|
background: var(--primary);
|
|
color: white;
|
|
border: none;
|
|
border-radius: 5px;
|
|
margin: 5px;
|
|
}
|
|
.print-btn:hover:not(:disabled) { background: var(--primary-dark); }
|
|
.print-btn:disabled { background: var(--text-light); cursor: not-allowed; }
|
|
|
|
.position-select { padding: 8px; font-size: 14px; margin-left: 10px; }
|
|
|
|
.loading-msg, .error-msg {
|
|
text-align: center;
|
|
padding: 2rem;
|
|
font-size: 1.125rem;
|
|
color: var(--text-light);
|
|
}
|
|
|
|
.print-sheet {
|
|
width: 8.5in;
|
|
height: 11in;
|
|
background: white;
|
|
margin: 0 auto;
|
|
position: relative;
|
|
border: 1px solid #ccc;
|
|
}
|
|
|
|
.label {
|
|
width: 3in;
|
|
height: 3in;
|
|
position: absolute;
|
|
display: flex;
|
|
flex-direction: column;
|
|
align-items: center;
|
|
justify-content: center;
|
|
padding: 0.1in;
|
|
box-sizing: border-box;
|
|
}
|
|
.label.inactive { border: 1px dashed #ccc; }
|
|
.label.active { border: 2px solid var(--primary); }
|
|
|
|
.qr-img { width: 144px; height: 144px; display: block; }
|
|
|
|
.pos-1 { top: 0.875in; left: 1.1875in; }
|
|
.pos-2 { top: 0.875in; left: 4.3125in; }
|
|
.pos-3 { top: 4in; left: 1.1875in; }
|
|
.pos-4 { top: 4in; left: 4.3125in; }
|
|
.pos-5 { top: 7.125in; left: 1.1875in; }
|
|
.pos-6 { top: 7.125in; left: 4.3125in; }
|
|
|
|
.model-name { font-size: 11pt; font-weight: bold; text-align: center; margin-bottom: 0.1in; color: #000; }
|
|
.qr-container { text-align: center; }
|
|
.info-section { margin-top: 0.1in; display: flex; flex-direction: column; align-items: center; }
|
|
.info-inner { text-align: left; }
|
|
.info-row { font-size: 9pt; color: #333; margin: 1px 0; white-space: nowrap; }
|
|
.csf-name { font-size: 12pt; font-weight: bold; font-family: monospace; text-align: center; margin-bottom: 0.06in; color: #000; }
|
|
|
|
@media print {
|
|
/* Force rendered images/colors to print even when "Background graphics" is
|
|
off, otherwise the QR image can drop out. */
|
|
body, .print-sheet, .label, .qr-img, .qr-container {
|
|
-webkit-print-color-adjust: exact !important;
|
|
print-color-adjust: exact !important;
|
|
}
|
|
body { padding: 0; margin: 0; background: white; }
|
|
.no-print { display: none !important; }
|
|
.print-sheet { border: none; margin: 0; width: 8.5in; height: 11in; overflow: hidden; }
|
|
.label { border: none !important; }
|
|
.label.inactive { visibility: hidden; }
|
|
}
|
|
</style>
|