Merge remote-tracking branch 'origin/master'

cl

2024-08-07 9245b19c6e094bf501ac5ea2a5b350e5910f6ef5

Merge remote-tracking branch 'origin/master'

 jcdm-ui/src/views/main/cfkb/Instructions/index.vue

@@ -14,8 +14,8 @@
      <el-col :span="10">
        <el-card shadow="never">
          <span class="head-font">产品序列号 : {{headContent.sfcCode}}</span>
          <!--         <el-input v-model="content" style="float: right;width: 150px;" placeholder="请输入内容"></el-input>-->
          <!--         <el-button @click="scanCompleted" style="float: right" type="primary">扫码完成</el-button>-->
          <el-button @click="print1">打印</el-button>

          <el-button type="primary" style="float: right" icon="el-icon-search" size="mini" @click="serialLink">串口连接</el-button>
          <el-button @click="clearClick" style="float: right" type="danger" size="mini">清除</el-button>
        </el-card>
@@ -29,30 +29,107 @@
            <span slot="label"> <a class="el-icon-date"></a>首页</span>
            <el-col :span="24">
              <div>
                <div style="display: none" id="printMe">
                  <br>
                  <p style="margin-left: 43px">9900166410</p>
                  <p style="margin-left: 43px">HW001.001</p>
                  <p style="margin-left: 43px">SW002.005</p>
                  <br>
                  <span style="font-size: 30px;font-weight: bold;margin-left: 40px;">GEELY</span><br>
                  <span style="font-size: 10px;margin-left: 29px">COMMERCIAL VEHICLE</span><br>
                  <span style="margin-left: 60px">H2155D</span><br>
                  <span style="margin-left: 63px">993083</span><br>
                  <span style="margin-left: 40px">9900166410</span><br>
                  <span style="font-size: 10px;margin-left: 17px;">{{text1}}</span>
                  <br>
                  <br>
                  <br>
                  <br>
                  <div ref="canvasWrapper" id="canvasWrapper1" style="display: flex;justify-content: center;margin-top: -27px;"></div>
                  <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>
                  <br>
                  <br>
                  <div ref="canvasWrapper" id="canvasWrapper2" style="display: flex;justify-content: center;margin-top: -27px"></div>
                  <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 id="printMe">
                  <div style="font-size: 20px;text-align: center;margin-top: 30px">
                    <span>电驱系统总成</span>
                  </div>
                  <div style="display: flex;margin-top: 10px">
                    <div class="div1">
                      <div>
                        <span>电机型号：</span><span>TZ180XSDSZX01</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>额定功率：</span><span>30KW</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>额定扭矩：</span><span>70N.m</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>额定电压：</span><span>336VDS</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>额工作制：</span><span>S9</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>持续工作电流：</span><span>115A</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>相数：</span><span>3</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>零件号：</span><span>9900200461</span><br>
                      </div>
                    </div>

                    <div class="div2">
                      <span>控制器型号：</span><span>KTZ34X23SZX07</span><br>
                      <div style="margin-top: 5px">
                        <span>峰值功率：</span><span>60KW</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>峰值转矩：</span><span>175N.m</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>最高转速：</span><span>12000rpm</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>防护等级：</span><span>IP68</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>峰值工作电流：</span><span>230A</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>绝缘等级：</span><span>H</span><br>
                      </div>
                      <div style="margin-top: 5px">
                        <span>出厂编号：</span><span>2407190000002</span><br>
                      </div>
                    </div>
                  </div>


                  <div style="text-align: center;margin-top: 130px">
                    <span>TZ180XSDSZX01</span><br>
                    <span>KTZ34X23SZX07</span><br>
                    <span>993083</span><br>
                    <span>9900166410</span><br>
                    <span>2407190000002</span>
                  </div>

                  <div style="margin-top: 30px;display: flex">
                    <div ref="canvasWrapper" id="canvasWrapper1" style="width: 30%;flex: 1"></div>
                    <div style="width: 70%;flex: 1;margin-top: 22px">
                      <span style="margin-left: -40px">
                        P9900166410#T{{text1}}
                      </span><br>
                      <span style="margin-left: -40px">
                        #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: 50px;display: flex">
                    <div ref="canvasWrapper" id="canvasWrapper2" style="width: 30%;flex: 1"></div>
                    <div style="width: 70%;flex: 1;margin-top: 22px">
                      <span style="margin-left: -40px">
                        P9900166410#T{{text1}}
                      </span><br>
                      <span style="margin-left: -40px">
                        #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: 50px">
                    <span>9900200461</span><br>
                    <span>MCU</span><br>
                    <span>HW 001.001</span><br>
                    <span>SW 001.001</span><br>
                  </div>

                </div>
                <el-button @click="print1">打印</el-button>
                <el-button style="display: none" @click="test1">生成二维码</el-button>
                <el-button style="display: none" @click="test2">生成二维码</el-button>

@@ -471,8 +548,8 @@
      document.getElementById('canvasWrapper1').innerHTML = '';
      this.$nextTick(() => {
        let qrCode = new QRCode('canvasWrapper1',{
          width: 120,
          height: 120,
          width: 85,
          height: 85,
          text: 'P9900166410#T'+ this.text1 +'#V993983#SSW002.005#HHW001.001#NBMS#',
          colorDark: '#000',
          colorLight: '#fff'
@@ -484,8 +561,8 @@
      document.getElementById('canvasWrapper2').innerHTML = '';
      this.$nextTick(() => {
          let qrCode = new QRCode('canvasWrapper2',{
            width: 120,
            height: 120,
            width: 85,
            height: 85,
            text: 'P9900166410#T'+ this.text1 +'#V993983#SSW002.005#HHW001.001#NBMS#',
            colorDark: '#000',
            colorLight: '#fff'
@@ -847,6 +924,12 @@

</script>
<style scoped>
.div1, .div2 {
  flex: 1; /* 两个div平分容器宽度 */
}
.div2{
  margin-left: 30px;
}
.bottom-card{
  height: 600px;
}