3 years ago · 9bb189ecbb
--- a/dist/assets/index-f4171c99.css
+++ b/dist/assets/index-f4171c99.css
--- a/dist/assets/print-0c0a74d0.css
+++ b/dist/assets/print-0c0a74d0.css
--- a/dist/assets/print-a182cf59.css
+++ b/dist/assets/print-a182cf59.css
--- a/dist/index.html
+++ b/dist/index.html
@@ -5,10 +5,10 @@
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
			
 
				   <title>CZRock</title>
			
 
				-  <script type="module" crossorigin src="./js/index-dc08ba4e.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/index-e84c2abc.js"></script>
			
 
				   <link rel="modulepreload" href="./js/iview-e6e434cb.js">
			
 
				   <link rel="stylesheet" href="./assets/iview-ee1eeafc.css">
			
 
				-  <link rel="stylesheet" href="./assets/index-f0be57da.css">
			
 
				+  <link rel="stylesheet" href="./assets/index-f4171c99.css">
			
 
				 </head>
			
 
				 
			
 
				 <body>
			
--- a/dist/js/Lithology-1c072229.js
+++ b/dist/js/Lithology-1c072229.js
@@ -0,0 +1 @@
 
				+import{n as o}from"./iview-e6e434cb.js";var s=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("Button",{attrs:{type:"primary"},on:{click:t.test}},[t._v(" \u6253\u5370 ")])],1)},c=[];const l={data(){return{}},methods:{test(){const t=window.$electron||null;t&&t.ipcRenderer.send("openPrint",!0)}}},r={};var i=o(l,s,c,!1,a,null,null,null);function a(t){for(let e in r)this[e]=r[e]}var u=function(){return i.exports}();export{u as default};
			
--- a/dist/js/Lithology-ba217e10.js
+++ b/dist/js/Lithology-ba217e10.js
@@ -1 +0,0 @@
 
				-import{n as o}from"./iview-e6e434cb.js";var s=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("Button",{attrs:{type:"primary"},on:{click:t.test}},[t._v(" \u6253\u5370 ")])],1)},c=[];const l={data(){return{}},methods:{test(){console.log(123);const t=window.$electron||null;t&&t.ipcRenderer.send("createBW",!0)}}},r={};var a=o(l,s,c,!1,i,null,null,null);function i(t){for(let e in r)this[e]=r[e]}var u=function(){return a.exports}();export{u as default};
			
--- a/dist/js/index-e84c2abc.js
+++ b/dist/js/index-e84c2abc.js
--- a/dist/js/print-dbcc8280.js
+++ b/dist/js/print-dbcc8280.js
--- a/dist/print.html
+++ b/dist/print.html
@@ -5,10 +5,10 @@
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
			
 
				   <title>CZRock</title>
			
 
				-  <script type="module" crossorigin src="./js/print-1eb7535f.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/print-dbcc8280.js"></script>
			
 
				   <link rel="modulepreload" href="./js/iview-e6e434cb.js">
			
 
				   <link rel="stylesheet" href="./assets/iview-ee1eeafc.css">
			
 
				-  <link rel="stylesheet" href="./assets/print-0c0a74d0.css">
			
 
				+  <link rel="stylesheet" href="./assets/print-a182cf59.css">
			
 
				 </head>
			
 
				 
			
 
				 <body>
			
--- a/main.js
+++ b/main.js
@@ -1,6 +1,7 @@
 
				 const {
			
 
				   app, BrowserWindow, Menu, ipcMain
			
 
				 } = require('electron')// 引入electron
			
 
				+// ----------------窗口init-------------
			
 
				 let win = null
			
 
				 let loadingWin = null
			
 
				 let print = null
			
@@ -44,10 +45,17 @@ const createWindow = () => {
 
				   win.on('close', () => {
			
 
				     // 回收BrowserWindow对象
			
 
				     win = null
			
 
				+    print = null
			
 
				   })
			
 
				 }
			
 
				-// 创建打印窗口
			
 
				+// 创建打印窗口=>宽高根据主窗口宽高80%定
			
 
				 const createPrint = () => {
			
 
				+  // 获取主窗口宽高
			
 
				+  // const winWH = win.getBounds()
			
 
				+  // const winWidth = 0
			
 
				+  // const winHeight = 0
			
 
				+
			
 
				+  // console.log(6666, winWH)
			
 
				   print = new BrowserWindow({
			
 
				     width: 1310,
			
 
				     height: 860,
			
@@ -55,7 +63,12 @@ const createPrint = () => {
 
				     resizable: false,
			
 
				     center: true,
			
 
				     transparent: true,
			
 
				-    show: false
			
 
				+    show: false,
			
 
				+    webPreferences: {
			
 
				+      contextIsolation: false,
			
 
				+      nodeIntegration: true,
			
 
				+      webSecurity: false
			
 
				+    }
			
 
				   })// 创建一个窗口
			
 
				   print.loadFile('dist/print.html')
			
 
				   // print.webContents.openDevTools()
			
@@ -64,6 +77,8 @@ const createPrint = () => {
 
				     print = null
			
 
				   })
			
 
				 }
			
 
				+
			
 
				+//  --------------事件监听fn-------------
			
 
				 // 事件监听
			
 
				 app.on('ready', async () => {
			
 
				   showLoading()
			
@@ -74,8 +89,9 @@ app.on('ready', async () => {
 
				     loadingWin.close()
			
 
				     win.show()
			
 
				   })
			
 
				-  // 监听是否打开print
			
 
				-  ipcMain.on('createBW', (state) => {
			
 
				+
			
 
				+  // 监听打开print
			
 
				+  ipcMain.on('openPrint', (event, data) => {
			
 
				     // TODO: 页面数据生成PDF
			
 
				 
			
 
				     // TODO: 数据回传打印组件
			
@@ -83,7 +99,14 @@ app.on('ready', async () => {
 
				     // 显示打印组件
			
 
				     print.show()
			
 
				 
			
 
				-    console.log(123, state)
			
 
				+    console.log('open', data)
			
 
				+  })
			
 
				+
			
 
				+  // 监听关闭print
			
 
				+  ipcMain.on('closePrint', (event, data) => {
			
 
				+    console.log('close', data)
			
 
				+    // 显示打印组件
			
 
				+    print.hide()
			
 
				   })
			
 
				 })
			
 
				 
			
--- a/src/pages/index/views/Lithology.vue
+++ b/src/pages/index/views/Lithology.vue
@@ -17,11 +17,10 @@ export default {
 
				   },
			
 
				   methods: {
			
 
				     test() {
			
 
				-      console.log(123)
			
 
				       // 通知主进程开启打印窗口
			
 
				       const electron = window.$electron || null
			
 
				       if (electron) {
			
 
				-        electron.ipcRenderer.send('createBW', true)
			
 
				+        electron.ipcRenderer.send('openPrint', true)
			
 
				       }
			
 
				     }
			
 
				   }
			
--- a/src/pages/print/App.vue
+++ b/src/pages/print/App.vue
@@ -180,7 +180,9 @@
 
				         <Button type="primary">
			
 
				           打印
			
 
				         </Button>
			
 
				-        <Button>取消</Button>
			
 
				+        <Button @click="close">
			
 
				+          取消
			
 
				+        </Button>
			
 
				       </div>
			
 
				     </div>
			
 
				   </div>
			
@@ -199,6 +201,15 @@ export default {
 
				         }
			
 
				       ]
			
 
				     }
			
 
				+  },
			
 
				+  methods: {
			
 
				+    close() {
			
 
				+      const electron = window.$electron || null
			
 
				+      console.log(electron)
			
 
				+      if (electron) {
			
 
				+        electron.ipcRenderer.send('closePrint', false)
			
 
				+      }
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				 </script>