Merge remote-tracking branch 'origin/master'
This commit is contained in:
zjf committed
commit
a36df511ee
3 files changed
+42
-27
No files matched your search
@@ -143,11 +143,14 @@ const state = reactive<{
|
||||
scanState: ScanState
|
||||
baseUrl: string
|
||||
plugins: PluginItem[]
|
||||
/** 助手构建版本（manifest.version，打包脚本注入），核对是否连上新包 */
|
||||
agentVersion: string
|
||||
lastScanAt: number
|
||||
}>({
|
||||
scanState: "idle",
|
||||
baseUrl: "",
|
||||
plugins: [],
|
||||
agentVersion: "",
|
||||
lastScanAt: 0,
|
||||
})
|
||||
|
||||
@@ -200,6 +203,7 @@ const scan = async (): Promise<PluginItem[]> => {
|
||||
const json = await res.json()
|
||||
state.baseUrl = base
|
||||
state.plugins = json.data.plugins ?? []
|
||||
state.agentVersion = json.data?.version ?? ""
|
||||
}
|
||||
state.scanState = "online"
|
||||
} catch {
|
||||
|
||||
@@ -1,65 +1,73 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 756 266" font-family="PingFang SC, Microsoft YaHei, sans-serif">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 756 266"
|
||||
font-family="PingFang SC, Microsoft YaHei, sans-serif">
|
||||
<!-- 顶部三要领 -->
|
||||
<text x="378" y="20" text-anchor="middle" font-size="13.5" font-weight="bold" fill="#2E5CF6">长边左右横放 ｜ 预印面朝上 ｜ 文字正对自己</text>
|
||||
<text x="378" y="20" text-anchor="middle" font-size="13.5" font-weight="bold" fill="#2E5CF6">长边左右横放
|
||||
｜ 预印面朝上 ｜ 文字正对自己</text>
|
||||
|
||||
<!-- ══════════ 图例① ✅ 正确放法 ══════════ -->
|
||||
<circle cx="14" cy="42" r="9" fill="#67c23a"/>
|
||||
<circle cx="14" cy="42" r="9" fill="#67c23a" />
|
||||
<text x="14" y="46" text-anchor="middle" font-size="11" font-weight="bold" fill="#ffffff">✓</text>
|
||||
<text x="30" y="46.5" font-size="13" font-weight="bold" fill="#67c23a">正确放法</text>
|
||||
|
||||
<rect x="0" y="60" width="244" height="154" rx="8" fill="#ffffff" stroke="#dcdfe6" stroke-width="1.5"/>
|
||||
<rect x="0" y="60" width="244" height="154" rx="8" fill="#ffffff" stroke="#dcdfe6"
|
||||
stroke-width="1.5" />
|
||||
<!-- 预印（出厂已有）：校徽 + 校名真实文字 -->
|
||||
<path d="M14 72 h18 v11 l-9 8 l-9 -8 z" fill="#2E5CF6"/>
|
||||
<path d="M14 72 h18 v11 l-9 8 l-9 -8 z" fill="#2E5CF6" />
|
||||
<text x="40" y="85" font-size="13" font-weight="bold" fill="#2E5CF6">青鸟同文实验学校</text>
|
||||
<text x="40" y="99" font-size="9" fill="#a8abb2">学生卡 · STUDENT CARD</text>
|
||||
<line x1="14" y1="110" x2="230" y2="110" stroke="#ebeef5"/>
|
||||
<line x1="14" y1="110" x2="230" y2="110" stroke="#ebeef5" />
|
||||
<!-- 我们打印的文字（黑色，与预印同向正立） -->
|
||||
<text x="18" y="140" font-size="16" font-weight="bold" fill="#303133">吴至元</text>
|
||||
<text x="18" y="164" font-size="11.5" fill="#606266">青鸟班 · Q4</text>
|
||||
<text x="18" y="184" font-size="10" fill="#909399">2023·09·01022</text>
|
||||
<text x="18" y="140" font-size="16" font-weight="bold" fill="#303133">我是姓名</text>
|
||||
<text x="18" y="164" font-size="11.5" fill="#606266">我是班级</text>
|
||||
<text x="18" y="184" font-size="10" fill="#909399">我是学号</text>
|
||||
|
||||
<text x="122" y="236" text-anchor="middle" font-size="11.5" font-weight="bold" fill="#67c23a">✓ 打印与预印同面、同向</text>
|
||||
<text x="122" y="236" text-anchor="middle" font-size="11.5" font-weight="bold" fill="#67c23a">✓
|
||||
打印与预印同面、同向</text>
|
||||
<text x="122" y="254" text-anchor="middle" font-size="10.5" fill="#909399">成品直接可用</text>
|
||||
|
||||
<!-- ══════════ 图例② ✗ 面放反了 ══════════ -->
|
||||
<circle cx="270" cy="42" r="9" fill="#f56c6c"/>
|
||||
<circle cx="270" cy="42" r="9" fill="#f56c6c" />
|
||||
<text x="270" y="46" text-anchor="middle" font-size="11" font-weight="bold" fill="#ffffff">✗</text>
|
||||
<text x="286" y="46.5" font-size="13" font-weight="bold" fill="#f56c6c">面放反了</text>
|
||||
|
||||
<rect x="256" y="60" width="244" height="154" rx="8" fill="#ffffff" stroke="#dcdfe6" stroke-width="1.5"/>
|
||||
<path d="M270 72 h18 v11 l-9 8 l-9 -8 z" fill="#2E5CF6"/>
|
||||
<rect x="256" y="60" width="244" height="154" rx="8" fill="#ffffff" stroke="#dcdfe6"
|
||||
stroke-width="1.5" />
|
||||
<path d="M270 72 h18 v11 l-9 8 l-9 -8 z" fill="#2E5CF6" />
|
||||
<text x="296" y="85" font-size="13" font-weight="bold" fill="#2E5CF6">青鸟同文实验学校</text>
|
||||
<text x="296" y="99" font-size="9" fill="#a8abb2">学生卡 · STUDENT CARD</text>
|
||||
<line x1="270" y1="110" x2="486" y2="110" stroke="#ebeef5"/>
|
||||
<line x1="270" y1="110" x2="486" y2="110" stroke="#ebeef5" />
|
||||
<!-- 打印的字落在背面：隔着卡料透显 = 左右反字、变淡 -->
|
||||
<g transform="translate(756 0) scale(-1 1)" opacity="0.75">
|
||||
<text x="274" y="140" font-size="16" font-weight="bold" fill="#a8abb2">吴至元</text>
|
||||
<text x="274" y="164" font-size="11.5" fill="#a8abb2">青鸟班 · Q4</text>
|
||||
<text x="274" y="184" font-size="10" fill="#a8abb2">2023·09·01022</text>
|
||||
<text x="274" y="140" font-size="16" font-weight="bold" fill="#a8abb2">我是姓名</text>
|
||||
<text x="274" y="164" font-size="11.5" fill="#a8abb2">我是班级</text>
|
||||
<text x="274" y="184" font-size="10" fill="#a8abb2">我是学号</text>
|
||||
</g>
|
||||
<text x="378" y="204" text-anchor="middle" font-size="8.5" fill="#c0c4cc">（隔卡料透显）</text>
|
||||
|
||||
<text x="378" y="236" text-anchor="middle" font-size="11.5" font-weight="bold" fill="#f56c6c">✗ 字印到背面，正面看是反字</text>
|
||||
<text x="378" y="236" text-anchor="middle" font-size="11.5" font-weight="bold" fill="#f56c6c">✗
|
||||
字印到背面，正面看是反字</text>
|
||||
<text x="378" y="254" text-anchor="middle" font-size="10.5" fill="#909399">整叠卡翻面重放即可</text>
|
||||
|
||||
<!-- ══════════ 图例③ ✗ 卡倒着放 ══════════ -->
|
||||
<circle cx="526" cy="42" r="9" fill="#f56c6c"/>
|
||||
<circle cx="526" cy="42" r="9" fill="#f56c6c" />
|
||||
<text x="526" y="46" text-anchor="middle" font-size="11" font-weight="bold" fill="#ffffff">✗</text>
|
||||
<text x="542" y="46.5" font-size="13" font-weight="bold" fill="#f56c6c">卡倒着放</text>
|
||||
|
||||
<rect x="512" y="60" width="244" height="154" rx="8" fill="#ffffff" stroke="#dcdfe6" stroke-width="1.5"/>
|
||||
<rect x="512" y="60" width="244" height="154" rx="8" fill="#ffffff" stroke="#dcdfe6"
|
||||
stroke-width="1.5" />
|
||||
<!-- 预印设计整组倒立（卡转了180°放入） -->
|
||||
<g transform="rotate(180 634 137)">
|
||||
<path d="M526 72 h18 v11 l-9 8 l-9 -8 z" fill="#2E5CF6"/>
|
||||
<path d="M526 72 h18 v11 l-9 8 l-9 -8 z" fill="#2E5CF6" />
|
||||
<text x="552" y="85" font-size="13" font-weight="bold" fill="#2E5CF6">青鸟同文实验学校</text>
|
||||
<text x="552" y="99" font-size="9" fill="#a8abb2">学生卡 · STUDENT CARD</text>
|
||||
<line x1="526" y1="110" x2="742" y2="110" stroke="#ebeef5"/>
|
||||
<line x1="526" y1="110" x2="742" y2="110" stroke="#ebeef5" />
|
||||
</g>
|
||||
<!-- 我们打印的字正立（与倒立的预印上下相反） -->
|
||||
<text x="530" y="140" font-size="16" font-weight="bold" fill="#303133">吴至元</text>
|
||||
<text x="530" y="164" font-size="11.5" fill="#606266">青鸟班 · Q4</text>
|
||||
<text x="530" y="184" font-size="10" fill="#909399">2023·09·01022</text>
|
||||
<text x="530" y="140" font-size="16" font-weight="bold" fill="#303133">我是姓名</text>
|
||||
<text x="530" y="164" font-size="11.5" fill="#606266">我是班级</text>
|
||||
<text x="530" y="184" font-size="10" fill="#909399">我是学号</text>
|
||||
|
||||
<text x="634" y="236" text-anchor="middle" font-size="11.5" font-weight="bold" fill="#f56c6c">✗ 打印字与预印字上下相反</text>
|
||||
<text x="634" y="236" text-anchor="middle" font-size="11.5" font-weight="bold" fill="#f56c6c">✗
|
||||
打印字与预印字上下相反</text>
|
||||
<text x="634" y="254" text-anchor="middle" font-size="10.5" fill="#909399">把卡转正重放即可</text>
|
||||
</svg>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 4.5 KiB |
@@ -24,6 +24,9 @@
|
||||
<el-alert v-if="printer.status !== 0" :closable="false" :type="printer.online ? 'error' : 'warning'" show-icon
|
||||
:title="printer.statusText || deviceStatusText(printer.status)" />
|
||||
<div class="device-grid">
|
||||
<div class="device-item">
|
||||
<span class="label">助手版本</span><span class="value">{{ pluginState.agentVersion || "-" }}</span>
|
||||
</div>
|
||||
<div class="device-item">
|
||||
<span class="label">型号</span><span class="value">{{ printer.model || "-" }}</span>
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user