From 6dbf383456d3caa5d489ddd0244b3c007ce458bb Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 26 九月 2024 16:02:44 +0800
Subject: [PATCH] 下线合格报告打印优化

---
 jcdm-ui/src/views/main/cfkb/Instructions/index.vue |  213 +++++++++++++++++++++++++++--------------------------
 1 files changed, 109 insertions(+), 104 deletions(-)

diff --git a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
index 3c1b742..bfb7891 100644
--- a/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
+++ b/jcdm-ui/src/views/main/cfkb/Instructions/index.vue
@@ -31,111 +31,114 @@
             <span slot="label"> <a class="el-icon-date"></a>棣栭〉</span>
             <el-col :span="24">
               <div>
+<!--                <div id="printMe">-->
+<!--                  <div style="font-size: 29px;text-align: center;margin-top: 64px">-->
+<!--                    <span>鐢甸┍绯荤粺鎬绘垚</span>-->
+<!--                  </div>-->
+<!--                  <div style="display: flex;margin-top: 2px;margin-left: 37px;font-size: 15px">-->
+<!--                    <div class="div1">-->
+<!--                      <div >-->
+<!--                        <span>鐢垫満鍨嬪彿锛�</span><span>TZ180XSDSZX01</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>棰濆畾鍔熺巼锛�</span><span>30KW</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>棰濆畾鎵煩锛�</span><span>70N.m</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>棰濆畾鐢靛帇锛�</span><span>336VDS</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>棰濆伐浣滃埗锛�</span><span>S9</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>鎸佺画宸ヤ綔鐢垫祦锛�</span><span>115A</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>鐩告暟锛�</span><span>3</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>闆朵欢鍙凤細</span><span>9900200461</span><br>-->
+<!--                      </div>-->
+<!--                    </div>-->
+
+<!--                    <div class="div2" style="font-size: 15px;margin-left: 17px">-->
+<!--                      <div>-->
+<!--                        <span>鎺у埗鍣ㄥ瀷鍙凤細</span><span>KTZ34X23SZX07</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>宄板�煎姛鐜囷細</span><span>60KW</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>宄板�艰浆鐭╋細</span><span>175N.m</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>鏈�楂樿浆閫燂細</span><span>12000rpm</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>闃叉姢绛夌骇锛�</span><span>IP68</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>宄板�煎伐浣滅數娴侊細</span><span>230A</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>缁濈紭绛夌骇锛�</span><span>H</span><br>-->
+<!--                      </div>-->
+<!--                      <div style="margin-top: 4px">-->
+<!--                        <span>鍑哄巶缂栧彿锛�</span><span>2407190000002</span><br>-->
+<!--                      </div>-->
+<!--                    </div>-->
+<!--                  </div>-->
+<!--                  <div style="font-size: 29px;margin-top: 2px;margin-left: 80px">-->
+<!--                    <span>婀栧窞鏅鸿姱鍔ㄥ姏鍙戝睍鏈夐檺鍏徃</span>-->
+<!--                  </div>-->
+
+
+<!--                  <div style="text-align: center;margin-top: 97px;font-size: 20px">-->
+<!--                    <span>TZ180XSDSZX01</span><br>-->
+<!--                    <span>KTZ34X23SZX07</span><br>-->
+<!--                    <span>993083</span><br>-->
+<!--                    <span>9900166410</span><br>-->
+<!--                    <span>2407190000002</span>-->
+<!--                  </div>-->
+
+<!--                  <div style="margin-top: 76px;display: flex;margin-left: 32px">-->
+<!--                    <div ref="canvasWrapper" id="canvasWrapper1" style="width: 30%;flex: 1"></div>-->
+<!--                    <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 17px">-->
+<!--                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">-->
+<!--                        P9900166410#T{{text1}}-->
+<!--                      </span><br>-->
+<!--                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">-->
+<!--                        #V993983#SSW002.005#HHW001.001#NMCU#-->
+<!--                      </span>-->
+<!--&lt;!&ndash;                      <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>&ndash;&gt;-->
+<!--                    </div>-->
+<!--                  </div>-->
+
+<!--                  <div style="margin-top: 42px;display: flex;margin-left: 32px">-->
+<!--                    <div ref="canvasWrapper" id="canvasWrapper2" style="width: 30%;flex: 1"></div>-->
+<!--                    <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 17px">-->
+<!--                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">-->
+<!--                        P9900166410#T{{text1}}-->
+<!--                      </span><br>-->
+<!--                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">-->
+<!--                        #V993983#SSW002.005#HHW001.001#NMCU#-->
+<!--                      </span>-->
+<!--                      &lt;!&ndash;                      <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>&ndash;&gt;-->
+<!--                    </div>-->
+<!--                  </div>-->
+
+<!--                  <div style="text-align: center;margin-left: -130px;margin-top: 42px">-->
+<!--                    <span>9900200461</span><br>-->
+<!--                    <span>MCU</span><br>-->
+<!--                    <span>HW 001.001</span><br>-->
+<!--                    <span>SW 001.001</span><br>-->
+<!--                  </div>-->
+
+<!--                </div>-->
                 <div id="printMe">
-                  <div style="font-size: 29px;text-align: center;margin-top: 64px">
-                    <span>鐢甸┍绯荤粺鎬绘垚</span>
-                  </div>
-                  <div style="display: flex;margin-top: 2px;margin-left: 37px;font-size: 15px">
-                    <div class="div1">
-                      <div >
-                        <span>鐢垫満鍨嬪彿锛�</span><span>TZ180XSDSZX01</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>棰濆畾鍔熺巼锛�</span><span>30KW</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>棰濆畾鎵煩锛�</span><span>70N.m</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>棰濆畾鐢靛帇锛�</span><span>336VDS</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>棰濆伐浣滃埗锛�</span><span>S9</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>鎸佺画宸ヤ綔鐢垫祦锛�</span><span>115A</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>鐩告暟锛�</span><span>3</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>闆朵欢鍙凤細</span><span>9900200461</span><br>
-                      </div>
-                    </div>
-
-                    <div class="div2" style="font-size: 15px;margin-left: 17px">
-                      <div>
-                        <span>鎺у埗鍣ㄥ瀷鍙凤細</span><span>KTZ34X23SZX07</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>宄板�煎姛鐜囷細</span><span>60KW</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>宄板�艰浆鐭╋細</span><span>175N.m</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>鏈�楂樿浆閫燂細</span><span>12000rpm</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>闃叉姢绛夌骇锛�</span><span>IP68</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>宄板�煎伐浣滅數娴侊細</span><span>230A</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>缁濈紭绛夌骇锛�</span><span>H</span><br>
-                      </div>
-                      <div style="margin-top: 4px">
-                        <span>鍑哄巶缂栧彿锛�</span><span>2407190000002</span><br>
-                      </div>
-                    </div>
-                  </div>
-                  <div style="font-size: 29px;margin-top: 2px;margin-left: 80px">
-                    <span>婀栧窞鏅鸿姱鍔ㄥ姏鍙戝睍鏈夐檺鍏徃</span>
-                  </div>
-
-
-                  <div style="text-align: center;margin-top: 97px;font-size: 20px">
-                    <span>TZ180XSDSZX01</span><br>
-                    <span>KTZ34X23SZX07</span><br>
-                    <span>993083</span><br>
-                    <span>9900166410</span><br>
-                    <span>2407190000002</span>
-                  </div>
-
-                  <div style="margin-top: 76px;display: flex;margin-left: 32px">
-                    <div ref="canvasWrapper" id="canvasWrapper1" style="width: 30%;flex: 1"></div>
-                    <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 17px">
-                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">
-                        P9900166410#T{{text1}}
-                      </span><br>
-                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">
-                        #V993983#SSW002.005#HHW001.001#NMCU#
-                      </span>
-<!--                      <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>-->
-                    </div>
-                  </div>
-
-                  <div style="margin-top: 42px;display: flex;margin-left: 32px">
-                    <div ref="canvasWrapper" id="canvasWrapper2" style="width: 30%;flex: 1"></div>
-                    <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 17px">
-                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">
-                        P9900166410#T{{text1}}
-                      </span><br>
-                      <span style="margin-left: -80px;font-size: 18px;font-family: FangSong">
-                        #V993983#SSW002.005#HHW001.001#NMCU#
-                      </span>
-                      <!--                      <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>-->
-                    </div>
-                  </div>
-
-                  <div style="text-align: center;margin-left: -130px;margin-top: 42px">
-                    <span>9900200461</span><br>
-                    <span>MCU</span><br>
-                    <span>HW 001.001</span><br>
-                    <span>SW 001.001</span><br>
-                  </div>
-
+                  <offline-qualification-report></offline-qualification-report>
                 </div>
                 <el-button style="display: none" @click="test1">鐢熸垚浜岀淮鐮�</el-button>
                 <el-button style="display: none" @click="test2">鐢熸垚浜岀淮鐮�</el-button>
@@ -307,9 +310,11 @@
   yzAddBasicParameters,
 } from "@/api/main/da/paramCollection/paramCollection";
 import QRCode from "qrcodejs2";
+import OfflineQualificationReport from "@/views/components/offlineQualificationReport.vue";
 
 export default {
   name: "stationTerminal",
+  components: {OfflineQualificationReport},
   data() {
     return {
       weightValue: '',

--
Gitblit v1.9.3