pdf 功能整改

src/components/PDF/contractPDF.vue

@@ -3,7 +3,7 @@
     <div id="printMe">
       <div
         id="pdfDom"
-        style="padding: 16px; font-size: 12px !important"
+        style="padding: 16px; font-size: 12px !important;font-family: 'msyh';"
       >
         <div style="font-size: 18px; text-align: center">
           {{ printDetails.sellCorporationNameEn }}

src/components/PDF/fundsPDF.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="pdfDom" style="width: 776px">
+    <div id="pdfDom"  style="font-family: 'msyh';">
       <div style="padding: 60px 30px; font-size: 12px !important; color: black">
         <div style="font-size: 16px; text-align: center; padding: 8px">
           <span>{{ dictValueLabel(printDetails.type, fundsType) }}审批单</span>

src/components/PDF/purchasePDF.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div id="pdfDom" ref="pdfDom" style="width: 776px">
+    <div id="pdfDom" ref="pdfDom" style="font-family: 'msyh';">
       <div style="border: 1px solid #000; border-collapse: collapse">
         <div style="text-align: right; padding: 10px 10px 0 0">
           合同号：{{ pdfData.code }}

src/components/notice/index.vue

@@ -205,6 +205,10 @@ const socketInit = () => {
 	window.ws.onopen = function () {
 		//当WebSocket创建成功时，触发onopen事件
 		console.log('open')
+		//每三十秒向后台发送一次心跳包
+		setInterval(() => {
+			window.ws.send('{"heartbeat":1111111}')
+		}, 30000)
 	}
 	window.ws.onmessage = function (e) {
 		//当客户端收到服务端发来的消息时，触发onmessage事件，参数e.data包含server传递过来的数据
@@ -234,12 +238,13 @@ const socketInit = () => {
 	}
 	window.ws.onclose = function (e) {
 		//当客户端收到服务端发送的关闭连接请求时，触发onclose事件
-		console.log('close')
+		logger.info(e.code + ' ' + e.reason + ' ' + e.wasClean);
 	}
 	window.ws.onerror = function (e) {
 		//如果出现连接、处理、接收、发送数据失败的时候触发onerror事件
 		console.log(error)
 	}
+	
 }
 let pushInfoReq = ref({
 	pageNum: 1,

src/utils/util.js

@@ -4,6 +4,7 @@ import Cookies from "js-cookie";
 import html2Canvas from "html2canvas";
 import JsPDF from "jspdf";
 import * as toEnglish from "./ACapital.js";
+import  "./msyh-normal.js";
 
 //根据value值回显字典label值
 export function dictDataEcho(value, arr) {
@@ -132,14 +133,15 @@ export function getPdf(title) {
   const element = document.getElementById("pdfDom");
   var doc = new JsPDF("", "pt", "a4");
   //导出pdf的中文有乱码
-  doc.addFont("simhei.ttf", "simhei", "normal");
-  doc.internal.scaleFactor = 1.0
+  doc.internal.scaleFactor = 1
+  //设置pdf边距
+  doc.setFont("msyh");
+  console.log('开始打印');
   doc.html(element, {
+    margin: [50,0,50,0],
     callback: function (doc) {
       doc.save();
     },
-    x: 10,
-    y: 10
   });
   return
   // pdfDom 这个就是你vue页面中定义的ID  比如<div id="pdfDom">  这个也要避下雷